From 5b4cc2f0b62947be8cbfeeac81e84e8ce7a2d651 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Mon, 19 Dec 2011 15:21:55 +0000 Subject: [PATCH] label: Use the widget state flags as a base for drawing --- gtk/gtklabel.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index e1ae3d061e..589f20a9e6 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -4062,10 +4062,7 @@ gtk_label_draw (GtkWidget *widget, gdk_cairo_region (cr, clip); cairo_clip (cr); - state = GTK_STATE_FLAG_SELECTED; - - if (gtk_widget_has_focus (widget)) - state |= GTK_STATE_FLAG_FOCUSED; + state |= GTK_STATE_FLAG_SELECTED; gtk_style_context_get_color (context, state, &fg_color); gtk_style_context_get_background_color (context, state, &bg_color); @@ -4131,9 +4128,9 @@ gtk_label_draw (GtkWidget *widget, text_color = link_color; if (info->link_clicked) - state = GTK_STATE_FLAG_ACTIVE; + state |= GTK_STATE_FLAG_ACTIVE; else - state = GTK_STATE_FLAG_PRELIGHT; + state |= GTK_STATE_FLAG_PRELIGHT; gtk_style_context_get_background_color (context, state, &bg_color); -- 2.30.2